Reworked the layout but still used the same strategy